Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 9 Jan 2010 11:00:21 +0000 (06:00 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 9 Jan 2010 11:00:21 +0000 (06:00 -0500)
commit5cd4f7ea04ddd926136c7822fe18346c695d4835
treeb20cc7d5cd7ae1f1a71dfe81940e4893e9d6add8
parenta1247306ee54c7d6f73b398110ee97e5b4627433
parentf10177f49a3ea9cf164faeaa72b3f1d0406056d2
Merge from mainline.
src/window.h
src/xdisp.c